Auto merge of #1460 - apasel422:1459, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 26 Mar 2015 19:29:34 +0000 (19:29 +0000)
committerbors <bors@rust-lang.org>
Thu, 26 Mar 2015 19:29:34 +0000 (19:29 +0000)
closes #1459


Trivial merge